Fix some symbol aliasing glitches

diff --git a/ChangeLog b/ChangeLog
index 6ce7c8d1605759ba004f2936ebb2923f52133aa6..42df3f9f00f861c2785d4a9f81aa3d01baf48039 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-29  Matthias Clasen <mclasen@redhat.com>
+
+       * gtk/gtk.symbols:
+       * gtk/gtkrecent*.c: Fix some symbol aliasing glitches.
+
 2006-03-29  Emmanuele Bassi  <ebassi@cvs.gnome.org>
 
        * gtk/gtkrecentchoosermenu.c: Make gtkalias.h the last included file.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6ce7c8d1605759ba004f2936ebb2923f52133aa6..42df3f9f00f861c2785d4a9f81aa3d01baf48039 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-03-29  Matthias Clasen <mclasen@redhat.com>
+
+       * gtk/gtk.symbols:
+       * gtk/gtkrecent*.c: Fix some symbol aliasing glitches.
+
 2006-03-29  Emmanuele Bassi  <ebassi@cvs.gnome.org>
 
        * gtk/gtkrecentchoosermenu.c: Make gtkalias.h the last included file.

diff --git a/gtk/gtkrecentchooser.c b/gtk/gtkrecentchooser.c
index 873eee1d467593c47413c4e9a569a5df6dfa3cc2..3fd58e034c45a96c2864d03214a85868e9c5f94c 100644 (file)
--- a/gtk/gtkrecentchooser.c
+++ b/gtk/gtkrecentchooser.c
@@ -962,5 +962,5 @@ _gtk_recent_chooser_selection_changed (GtkRecentChooser *chooser)
   g_signal_emit (chooser, chooser_signals[SELECTION_CHANGED], 0);
 }
 
-#define __GTK_RECENT_CHOOSER_H__
+#define __GTK_RECENT_CHOOSER_C__
 #include "gtkaliasdef.c"

diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index e830e96cbf90027a0670109f78e512ac2d1c1e10..41c8accf324506eb96370111cd3dc680f660e834 100644 (file)
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -68,7 +68,6 @@
 #include "gtktooltips.h"
 #include "gtktypebuiltins.h"
 #include "gtkvbox.h"
-#include "gtkalias.h"
 
 #include "gtkrecentmanager.h"
 #include "gtkrecentfilter.h"
@@ -77,6 +76,8 @@
 #include "gtkrecentchooserutils.h"
 #include "gtkrecentchooserdefault.h"
 
+#include "gtkalias.h"
+
 \f
 
 struct _GtkRecentChooserDefault

diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index b575f8f7185e9a145e0ad392534060382bfb5b57..f1f3f016adb7774791ba4f6cd892434543f801b1 100644 (file)
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -45,6 +45,13 @@
 #include "gtkobject.h"
 #include "gtktooltips.h"
 #include "gtktypebuiltins.h"
+
+#include "gtkrecentmanager.h"
+#include "gtkrecentfilter.h"
+#include "gtkrecentchooser.h"
+#include "gtkrecentchooserutils.h"
+#include "gtkrecentchooserprivate.h"
+#include "gtkrecentchoosermenu.h"
 #include "gtkalias.h"
 
 struct _GtkRecentChooserMenuPrivate

diff --git a/gtk/gtkrecentchooserutils.c b/gtk/gtkrecentchooserutils.c
index b7fa81d5a04fe7583085d9295b3e0e78a89ce5cf..3f1cdb4c5e1b7148e4691dc78de654892b029a23 100644 (file)
--- a/gtk/gtkrecentchooserutils.c
+++ b/gtk/gtkrecentchooserutils.c
@@ -293,6 +293,3 @@ delegate_item_activated (GtkRecentChooser *receiver,
 {
   _gtk_recent_chooser_item_activated (GTK_RECENT_CHOOSER (user_data));
 }
-
-#define __GTK_RECENT_CHOOSER_UTILS_H__
-#include "gtkaliasdef.c"